From 6ea0b7d04624d5143d6d3fa3a82b32384417f340 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 8 Jun 2006 03:51:21 +0000 Subject: [PATCH] Adjust Delete insensitivity --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ gtk/gtkentry.c | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24cd29846d..0f68b3992b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-06-07 Matthias Clasen + * gtk/gtkentry.c (popup_targets_received): Make Delete + menuitem insensitive if entry is not editable. (#344232, + Milosz Derezynski) + * gtk/gtkprintoperation.c: Add some docs. * gtk/gtk.symbols: Add gtk_print_operation_set_allow_async. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 24cd29846d..0f68b3992b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2006-06-07 Matthias Clasen + * gtk/gtkentry.c (popup_targets_received): Make Delete + menuitem insensitive if entry is not editable. (#344232, + Milosz Derezynski) + * gtk/gtkprintoperation.c: Add some docs. * gtk/gtk.symbols: Add gtk_print_operation_set_allow_async. diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index be5532a5dd..022c3f4d84 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -4857,7 +4857,7 @@ popup_targets_received (GtkClipboard *clipboard, gtk_widget_destroy (entry->popup_menu); entry->popup_menu = gtk_menu_new (); - + b gtk_menu_attach_to_widget (GTK_MENU (entry->popup_menu), GTK_WIDGET (entry), popup_menu_detach); @@ -4870,7 +4870,7 @@ popup_targets_received (GtkClipboard *clipboard, entry->editable && clipboard_contains_text); menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_DELETE, NULL); - gtk_widget_set_sensitive (menuitem, entry->current_pos != entry->selection_bound); + gtk_widget_set_sensitive (menuitem, entry->editable && entry->current_pos != entry->selection_bound); g_signal_connect_swapped (menuitem, "activate", G_CALLBACK (gtk_entry_delete_cb), entry); gtk_widget_show (menuitem); -- 2.30.2